Fix Core Data model duplication test flakiness #25932
+52
−224
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.